merge master

author Joakim Verona <joakim@verona.se>

Thu, 22 Jan 2015 07:27:13 +0000 (08:27 +0100)

committer Joakim Verona <joakim@verona.se>

Thu, 22 Jan 2015 07:27:13 +0000 (08:27 +0100)
author Joakim Verona <joakim@verona.se>
Thu, 22 Jan 2015 07:27:13 +0000 (08:27 +0100)
committer Joakim Verona <joakim@verona.se>
Thu, 22 Jan 2015 07:27:13 +0000 (08:27 +0100)
diff --cc src/dispnew.c
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Thu, 22 Jan 2015 07:27:13 +0000 (08:27 +0100)
committer	Joakim Verona <joakim@verona.se>
	Thu, 22 Jan 2015 07:27:13 +0000 (08:27 +0100)
		1	2
src/dispnew.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history